Merge "Revert "Default installations to using RemexHtml for tidying""